[skia-sync] Merge upstream chrome/m151 - #334
Closed
mattleibow wants to merge 3 commits into
Closed
Conversation
Bug: b/535581863 Change-Id: Idffa66ff5cb6247d28dbc0b17006352198164770 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1308756 Auto-Submit: Eric Boren <borenet@google.com> Reviewed-by: Kaylee Lubick <kjlubick@google.com> Commit-Queue: Kaylee Lubick <kjlubick@google.com>
Original change's description: > Address incorrect handling of a map pointer in SkRP > > In pushChildCall, we held on to a pointer from a fChildEffectMap > and then later dereferenced it. However, in between those > points was a code path that could grow the map, invalidating > the pointer. This is demonstrated in the newly added test. > > To fix it, we just dereference it earlier. While tracking this > down, I found a suspicious other usage of the map which works > in newer C++, but could break in older versions. It's trivial > to fix Generator::writeFunction, so I handled that as well. > > Bug: b/540157141 > Fixed: 540157141 > Change-Id: I149b070c31d4cfefa65b30972f0b8b94441e66db > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1308776 > Reviewed-by: Jorge Betancourt <jmbetancourt@google.com> > Commit-Queue: Kaylee Lubick <kjlubick@google.com> (cherry picked from commit 5b90a36) Bug: 541111785,b/540157141,540157141 Change-Id: I149b070c31d4cfefa65b30972f0b8b94441e66db Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1311216 Commit-Queue: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com>
mattleibow
added
type/milestone-sync
mattleibow
marked this pull request as ready for review
August 4, 2026 16:25
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated upstream merge of
chrome/m151.Summary
Same-milestone bug-fix sync: merges the latest upstream
chrome/m151commits into mono/skiaskiasharp.Upstream Merge
upstream/chrome/m151(tip86bb2f25f4)skiasharp(a0dd072787)86bb2f25f4[M151] Address incorrect handling of a map pointer in SkRPf7be6d7766Roll infra dep to 055b758759c89b0cfafc8264ae2100a9aa6582d3-s ours.Conflicts Resolved
None.
git merge --no-commit upstream/chrome/m151reportedAuto-merging DEPSand completed cleanly;git diff --checkreported zero conflict markers.Modified files inherited from upstream (no manual resolution required):
DEPS.disabled.go.mod,.disabled.go.suminfra/bots/deps/deps_gen.goinfra/bots/task_drivers/{canvaskit_gold,check_generated_files,cpu_tests,go_linters,toolchain_layering_check}/*.goinfra/bots/tasks.jsonsrc/sksl/codegen/SkSLRasterPipelineCodeGenerator.cpptests/RasterPipelineCodeGeneratorTest.cppSince no fork-owned files (
src/c/,include/c/,BUILD.gn) were touched by the upstream commits, no verify-upstream-or-reapply audit was needed. Fork-patch snapshot (/tmp/gh-aw/agent/fork-patches-before.txt) preserved for the record: 1053 patches onskiasharpabove the merge base, all of which merged cleanly.C API Fixes
None required — no C API files (
src/c/,include/c/) changed.Verification
ls src/c/*.cpp include/c/*.h— all fork C API files intact.git diff --check— clean.Items Needing Human Attention
None.
Created by skia-upstream-sync.